From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 28 Jun 2011 15:41:56 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2379^2~30
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=63fa0cb4c1f67ed5564fa6f79286ccd16ae1721c;p=emacs.git

Merge from trunk.
---

63fa0cb4c1f67ed5564fa6f79286ccd16ae1721c